Simplify recursive invocation
Refactor adding sandbox sources
Tweak messages