diff --git a/.babelrc b/.babelrc
index e100ece..b8ebf03 100644
--- a/.babelrc
+++ b/.babelrc
@@ -15,12 +15,12 @@
     },
     "es": {
       "plugins": [
-        "external-helpers"
+        "@babel/plugin-external-helpers"
       ]
     },
     "umd": {
       "plugins": [
-        "external-helpers",
+        "@babel/plugin-external-helpers",
         [
           "./modules/babel-plugin-merge-imports",
           {
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 2bdc1f7..5b89799 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,149 +1,53 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="html,thead,tbody,tfoot" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
-    <DB2CodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <CssCodeStyleSettings>
+      <option name="HEX_COLOR_LOWER_CASE" value="true" />
+      <option name="HEX_COLOR_LONG_FORMAT" value="true" />
+    </CssCodeStyleSettings>
+    <DB2CodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
       <option name="IMP_DECLARE_EL_WRAP" value="1" />
       <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </DB2CodeStyleSettings>
-    <DerbyCodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <DerbyCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
       <option name="IMP_DECLARE_EL_WRAP" value="1" />
       <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </DerbyCodeStyleSettings>
-    <H2CodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <GoCodeStyleSettings>
+      <option name="ADD_LEADING_SPACE_TO_COMMENTS" value="true" />
+      <option name="IMPORT_SORTING" value="GOIMPORTS" />
+      <option name="MOVE_ALL_IMPORTS_IN_ONE_DECLARATION" value="true" />
+      <option name="MOVE_ALL_STDLIB_IMPORTS_IN_ONE_GROUP" value="true" />
+      <option name="GROUP_STDLIB_IMPORTS" value="true" />
+      <option name="GROUP_CURRENT_PROJECT_IMPORTS" value="true" />
+    </GoCodeStyleSettings>
+    <H2CodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
-      <option name="IMP_DECLARE_EL_WRAP" value="1" />
-      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </H2CodeStyleSettings>
-    <HSQLCodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <HSQLCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
-      <option name="IMP_DECLARE_EL_WRAP" value="1" />
-      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </HSQLCodeStyleSettings>
     <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
       <option name="HTML_DO_NOT_INDENT_CHILDREN_OF" value="html,thead,tbody,tfoot" />
     </HTMLCodeStyleSettings>
     <JSCodeStyleSettings version="0">
@@ -153,266 +57,105 @@
       <option name="USE_DOUBLE_QUOTES" value="false" />
       <option name="FORCE_QUOTE_STYlE" value="true" />
       <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
       <option name="SPACES_WITHIN_IMPORTS" value="true" />
       <option name="USE_CHAINED_CALLS_GROUP_INDENTS" value="true" />
+      <option name="IMPORT_SORT_MODULE_NAME" value="true" />
+      <option name="IMPORT_PREFER_ABSOLUTE_PATH" value="TRUE" />
     </JSCodeStyleSettings>
-    <MSSQLCodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <MSSQLCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
       <option name="IMP_DECLARE_EL_WRAP" value="1" />
       <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </MSSQLCodeStyleSettings>
-    <MySQLCodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <MySQLCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
-      <option name="IMP_DECLARE_EL_WRAP" value="1" />
-      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </MySQLCodeStyleSettings>
-    <OracleCodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <OracleCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
       <option name="IMP_DECLARE_EL_WRAP" value="1" />
       <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </OracleCodeStyleSettings>
     <PHPCodeStyleSettings>
       <option name="ALIGN_PHPDOC_PARAM_NAMES" value="true" />
       <option name="ALIGN_PHPDOC_COMMENTS" value="true" />
       <option name="COMMA_AFTER_LAST_ARRAY_ELEMENT" value="true" />
+      <option name="PHPDOC_BLANK_LINE_BEFORE_TAGS" value="true" />
+      <option name="PHPDOC_BLANK_LINES_AROUND_PARAMETERS" value="true" />
       <option name="PHPDOC_WRAP_LONG_LINES" value="true" />
       <option name="LOWER_CASE_BOOLEAN_CONST" value="true" />
       <option name="LOWER_CASE_NULL_CONST" value="true" />
+      <option name="ELSE_IF_STYLE" value="COMBINE" />
       <option name="VARIABLE_NAMING_STYLE" value="CAMEL_CASE" />
       <option name="BLANK_LINES_BEFORE_RETURN_STATEMENT" value="1" />
       <option name="KEEP_RPAREN_AND_LBRACE_ON_ONE_LINE" value="true" />
       <option name="FORCE_SHORT_DECLARATION_ARRAY_STYLE" value="true" />
+      <option name="NULL_TYPE_POSITION" value="IN_THE_BEGINNING" />
+      <option name="IF_RPAREN_ON_NEXT_LINE" value="true" />
     </PHPCodeStyleSettings>
-    <PostgresCodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <PostgresCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
       <option name="IMP_DECLARE_EL_WRAP" value="1" />
       <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </PostgresCodeStyleSettings>
-    <SQLiteCodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <SQLiteCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
-      <option name="IMP_DECLARE_EL_WRAP" value="1" />
-      <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </SQLiteCodeStyleSettings>
-    <SqlCodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <ScssCodeStyleSettings>
+      <option name="HEX_COLOR_LOWER_CASE" value="true" />
+      <option name="HEX_COLOR_LONG_FORMAT" value="true" />
+    </ScssCodeStyleSettings>
+    <SqlCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
       <option name="IMP_DECLARE_EL_WRAP" value="1" />
       <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </SqlCodeStyleSettings>
-    <SybaseCodeStyleSettings version="0">
-      <option name="myVersion" value="0" />
-      <option name="ALIAS_CASE" value="4" />
-      <option name="TYPE_CASE" value="3" />
-      <option name="QUERY_TRUE_INDENT" value="false" />
-      <option name="QUERY_ALIGN_ELEMENTS" value="false" />
-      <option name="QUERY_ALIGN_LINE_COMMENTS" value="false" />
-      <option name="INSERT_EL_COMMA" value="2" />
-      <option name="SET_EL_WRAP" value="0" />
-      <option name="SET_EL_COMMA" value="0" />
-      <option name="WITH_EL_WRAP" value="0" />
-      <option name="WITH_EL_COMMA" value="0" />
-      <option name="SELECT_EL_WRAP" value="3" />
-      <option name="SELECT_EL_COMMA" value="2" />
-      <option name="FROM_EL_WRAP" value="2" />
-      <option name="FROM_EL_COMMA" value="2" />
-      <option name="FROM_PLACE_ON" value="10" />
-      <option name="WHERE_EL_WRAP" value="3" />
-      <option name="WHERE_EL_BOUND" value="2" />
-      <option name="ORDER_EL_COMMA" value="2" />
+    <SybaseCodeStyleSettings version="2">
+      <option name="KEYWORD_CASE" value="0" />
       <option name="TABLE_OPENING" value="1" />
       <option name="TABLE_CONTENT" value="2" />
       <option name="TABLE_CLOSING" value="3" />
-      <option name="TABLE_ALTER_INSTRUCTION_ALIGN" value="false" />
       <option name="POST_OPT_WRAP_1" value="true" />
-      <option name="POST_OPT_ALIGN" value="false" />
-      <option name="ROUTINE_ARG_COMMA" value="2" />
-      <option name="ROUTINE_ARG_ALIGN_TYPES" value="true" />
       <option name="IMP_DECLARE_EL_WRAP" value="1" />
       <option name="IMP_IF_THEN_WRAP_THEN" value="true" />
-      <option name="CORTEGE_SPACE_BEFORE_L_PAREN" value="false" />
-      <option name="EXPR_CASE_WHEN_WRAP" value="false" />
-      <option name="EXPR_CASE_THEN_WRAP" value="true" />
-      <option name="PRIMARY_KEY_NAME_TEMPLATE" value="{table}_{columns}_pk" />
     </SybaseCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+      <option name="IMPORT_SORT_MODULE_NAME" value="true" />
+      <option name="IMPORT_PREFER_ABSOLUTE_PATH" value="TRUE" />
+    </TypeScriptCodeStyleSettings>
+    <XML>
+      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </XML>
     <codeStyleSettings language="CFML">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     </codeStyleSettings>
@@ -438,6 +181,10 @@
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
     </codeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+    </codeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
@@ -466,20 +213,23 @@
       </indentOptions>
     </codeStyleSettings>
     <codeStyleSettings language="PHP">
+      <option name="RIGHT_MARGIN" value="120" />
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="LINE_COMMENT_ADD_SPACE" value="true" />
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
       <option name="BLANK_LINES_AFTER_PACKAGE" value="1" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="5" />
-      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-      <option name="EXTENDS_LIST_WRAP" value="5" />
-      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="ALIGN_MULTILINE_FOR" value="false" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
       <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
       <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
       <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="1" />
+      <option name="FOR_STATEMENT_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_RPAREN_ON_NEXT_LINE" value="true" />
       <option name="ARRAY_INITIALIZER_WRAP" value="5" />
       <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
       <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
@@ -487,6 +237,109 @@
       <option name="DOWHILE_BRACE_FORCE" value="3" />
       <option name="WHILE_BRACE_FORCE" value="3" />
       <option name="FOR_BRACE_FORCE" value="3" />
+      <arrangement>
+        <groups />
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <TRAIT>true</TRAIT>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <CONST>true</CONST>
+                  <visibility />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PUBLIC>true</PUBLIC>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PROTECTED>true</PROTECTED>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <FIELD>true</FIELD>
+                  <PRIVATE>true</PRIVATE>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <CONSTRUCTOR>true</CONSTRUCTOR>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <METHOD>true</METHOD>
+                  <PUBLIC>true</PUBLIC>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <METHOD>true</METHOD>
+                  <PROTECTED>true</PROTECTED>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <METHOD>true</METHOD>
+                  <PRIVATE>true</PRIVATE>
+                  <modifiers />
+                </AND>
+              </match>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="PostgreSQL">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    </codeStyleSettings>
+    <codeStyleSettings language="SQL">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     </codeStyleSettings>
     <codeStyleSettings language="TypeScript">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
@@ -509,8 +362,17 @@
         <option name="TAB_SIZE" value="2" />
       </indentOptions>
     </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+    </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     </codeStyleSettings>
+    <codeStyleSettings language="yaml">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="4" />
+      </indentOptions>
+    </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/build/util.js b/build/util.js
index 610ebba..6e086ef 100644
--- a/build/util.js
+++ b/build/util.js
@@ -2,7 +2,7 @@ const replace = require('rollup-plugin-replace')
 const babel = require('rollup-plugin-babel')
 const resolve = require('rollup-plugin-node-resolve')
 const cjs = require('rollup-plugin-commonjs')
-const {uglify} = require('rollup-plugin-uglify')
+const { uglify } = require('rollup-plugin-uglify')
 
 function plugins (options = {}) {
   const plugins = [
@@ -16,24 +16,22 @@ function plugins (options = {}) {
       ],
     }),
     resolve({
-      main: true,
-      module: true,
-      jsnext: true,
+      mainFields: ['module', 'main'],
       browser: true,
     }),
     cjs(),
   ]
   if (options.min) {
-    plugins.push(uglify({
-      mangle: true,
-      sourcemap: true,
-      compress: {
-        warnings: false,
-      },
-      output: {
-        preamble: options.banner,
-      },
-    }))
+    plugins.push(
+      uglify({
+        mangle: true,
+        sourcemap: true,
+        compress: true,
+        output: {
+          preamble: options.banner,
+        },
+      }),
+    )
   }
   return plugins
 }
diff --git a/package-lock.json b/package-lock.json
index 46202d0..e42f074 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -389,6 +389,15 @@
       "integrity": "sha512-mdFqWrSPCmikBoaBYMuBulzTIKuXVPtEISFbRRVNwMWpCms/hmE2kRq0bblUHaNRKrjRlmVbx1sDHmjmRgD2Xg==",
       "dev": true
     },
+    "@babel/plugin-external-helpers": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-external-helpers/-/plugin-external-helpers-7.2.0.tgz",
+      "integrity": "sha512-QFmtcCShFkyAsNtdCM3lJPmRe1iB+vPZymlB4LnDIKEBj2yKQLQKtoxXxJ8ePT5fwMl4QGg303p4mB0UsSI2/g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
     "@babel/plugin-proposal-async-generator-functions": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz",
@@ -1804,15 +1813,6 @@
         "object.assign": "^4.1.0"
       }
     },
-    "babel-plugin-external-helpers": {
-      "version": "6.22.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.22.0.tgz",
-      "integrity": "sha1-IoX0iwK9Xe3oUXXK+MYuhq3M76E=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
     "babel-plugin-istanbul": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
@@ -1825,16 +1825,6 @@
         "test-exclude": "^5.2.3"
       }
     },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
     "backo2": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
@@ -2908,12 +2898,6 @@
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
       "dev": true
     },
-    "core-js": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz",
-      "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=",
-      "dev": true
-    },
     "core-js-compat": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.2.1.tgz",
@@ -9271,12 +9255,6 @@
         "regenerate": "^1.4.0"
       }
     },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
     "regenerator-transform": {
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
diff --git a/package.json b/package.json
index 881690c..87d7833 100644
--- a/package.json
+++ b/package.json
@@ -40,9 +40,9 @@
   },
   "devDependencies": {
     "@babel/core": "^7.6.2",
+    "@babel/plugin-external-helpers": "^7.2.0",
     "@babel/preset-env": "^7.6.2",
     "babel-loader": "^8.0.6",
-    "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-istanbul": "^5.2.0",
     "chai": "^4.2.0",
     "coveralls": "^3.0.6",