Changed Entity classes for OES- Manli