Fixes to mapper classes (#7589)

- Fixed imports in mapper classes
- Fixed getprop() calls