Added aspect scope, refactored type processing