Some Entity changes