Custom command support