Refactor adding sandbox sources