changes to scaffolding to fix with external modules