Improve scope and context
0.1.2