Added @command decorator and improved parsing