Added service API call mappings
Added None/empty parameter and element value checking