Updates to Entity and Component classes

Updated Entity and Component classes.