Custom commands
Custom commands parser fixes