Entity structure changes