Change from hardcoded options to arguments