Session management & token aspect annotation added