Updated helpers.
- Changed context lookups to match from contexts.
- Added logging