+ removed some deprecated code
+ Fixed issue with context saving