Edit the CommandParser to use the new function classes