Added skip_core_modules option