refactored mapping creation
re introduced due to merge
added tests
renamed SecurityService to AuthenticationService
shows the right user on reload