Add support for options on executing a internal command