Added new component classes