Update to handle being it's own entity