Made changes on the Component and Enitity Classes.