Added better custom command support