Use Proper Mapping In SmartApp