Annotation and Session Handling improvements
Adding back annotation code