Several changes to contexts