added stage entity handling