WCP-80 : Added missing annotations and component-scanning