Improve SecurityManager
Delete SecurityContext dep thanks to SecurityManager
Delete @TODO for senio Insight
Improve listener