Added garage and improved other classes functionalities