Fix #32
Fix #46
Add employee field in User entity