Added support for spring-security layer