Updated entity and unit components