Implement a more flexible Command system to allow later on more features