Refactored annotations
Added more architecture