Misc improvements
Add "context" arg