Small changes on entities