Change the implementation way of entity layout