Changed to Entity in command handler