diff --git a/package.json b/package.json
index 84e37ca8..8163b2fd 100644
--- a/package.json
+++ b/package.json
@@ -133,7 +133,8 @@
 		"trailingComma": "none",
 		"bracketSpacing": true,
 		"semi": true,
-		"useTabs": true
+		"useTabs": true,
+		"arrowParens": "always"
 	},
 	"nyc": {
 		"include": [
diff --git a/src/formGroup.vue b/src/formGroup.vue
index 7d0d7f14..522f669a 100644
--- a/src/formGroup.vue
+++ b/src/formGroup.vue
@@ -23,27 +23,10 @@
 	</div>
 </template>
 <script>
-import { get as objGet, forEach, isNil, isFunction } from "lodash";
+import { get as objGet, isNil, isFunction } from "lodash";
 import { slugifyFormID } from "./utils/schema";
 import formMixin from "./formMixin.js";
-
-let fieldComponents = {};
-
-let coreFields = require.context("./fields/core", false, /^\.\/field([\w-_]+)\.vue$/);
-
-forEach(coreFields.keys(), key => {
-	let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
-	fieldComponents[compName] = coreFields(key).default;
-});
-
-if (process.env.FULL_BUNDLE) {
-	let Fields = require.context("./fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);
-
-	forEach(Fields.keys(), key => {
-		let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
-		fieldComponents[compName] = Fields(key).default;
-	});
-}
+import fieldComponents from "./utils/fieldsLoader.js";
 
 export default {
 	name: "form-group",
@@ -111,7 +94,7 @@ export default {
 			return field.hint;
 		},
 		fieldErrors(field) {
-			return this.errors.filter(e => e.field === field).map(item => item.error);
+			return this.errors.filter((e) => e.field === field).map((item) => item.error);
 		},
 		modelUpdated(newVal, schema) {
 			this.$emit("model-updated", newVal, schema);
diff --git a/src/index.js b/src/index.js
index c0fef5a4..4e3b9827 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,8 +1,9 @@
 const component = require("./formGenerator.vue").default;
 const schema = require("./utils/schema.js");
 const validators = require("./utils/validators.js").default;
+const fieldComponents = require("./utils/fieldsLoader").default;
 const abstractField = require("./fields/abstractField").default;
-const install = Vue => {
+const install = (Vue) => {
 	Vue.component("VueFormGenerator", module.exports.component);
 };
 
@@ -11,5 +12,6 @@ module.exports = {
 	schema,
 	validators,
 	abstractField,
+	fieldComponents,
 	install
 };
diff --git a/src/utils/fieldsLoader.js b/src/utils/fieldsLoader.js
new file mode 100644
index 00000000..7eddec09
--- /dev/null
+++ b/src/utils/fieldsLoader.js
@@ -0,0 +1,21 @@
+const forEach = require("lodash").forEach;
+
+let fieldComponents = {};
+
+let coreFields = require.context("../fields/core", false, /^\.\/field([\w-_]+)\.vue$/);
+
+forEach(coreFields.keys(), (key) => {
+	let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
+	fieldComponents[compName] = coreFields(key).default;
+});
+
+if (process.env.FULL_BUNDLE) {
+	let optionalFields = require.context("../fields/optional", false, /^\.\/field([\w-_]+)\.vue$/);
+
+	forEach(optionalFields.keys(), (key) => {
+		let compName = key.replace(/^\.\//, "").replace(/\.vue/, "");
+		fieldComponents[compName] = optionalFields(key).default;
+	});
+}
+
+module.exports = fieldComponents;