Updated documentation and allowed for custom context creation