Add check in Context creation
Cleanup