Variability management with feature-oriented programming and aspects