Improve interface for command