Refactored Param functions to use objects