added support to non built in commands