Added qualfier annotations and scopes