Moved Param stuff into a single class