Update provider usage, implement context() handling
Slight whitespace issue