Change to return entity