[EM] updated model to cover all attributes