Tweak notation
Support local sandbox sources