Changed Entity classes for TMS WMS and OES- Manli