General Refactor and change string parameter to enum.