User entity - addressed comments