Converted to 'long form' definitions of commands