Updates to Entity and gameObject