Small changes to entities