Modified some models and change CommonEntity class to abstract