Entity expansion

Entity definition is expanded;