Modify OnCommand call so it's done while parsing