Changed parameter names to be symbols rather than strings