Changed parameters back to using enumeration (issue #164)