Improved models after reading the UI again
Added UI Model mapping
Added UI Mapping to both the other models