Properly expose entity JSON fields