AOM: Aspect-Oriented Modeling