some changes due to adding Spring Security