improvements on user entity