Removed redundant dependency
Added configuration via Annotation