Annotations fixes. getting things ready for IoC