Add support for commands (Add config later)