Refactor Userbundle