EdmGen2 Modified : All Entity related processing now in separate class file