Updated to support 0.6 scoping