created new package apostate and move Context there