diff --git a/Form/Adaptor.cls.xml b/Form/Adaptor.cls.xml
index 3f6f043..1028b5a 100644
--- a/Form/Adaptor.cls.xml
+++ b/Form/Adaptor.cls.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:46:06">
 <Class name="Form.Adaptor">
 <Description>
 Base form adaptor class, all forms must inherit from this class</Description>
@@ -8,6 +8,7 @@ Base form adaptor class, all forms must inherit from this class</Description>
 <IncludeCode>Form</IncludeCode>
 <PropertyClass>Form.Field</PropertyClass>
 <Super>Form.Security,Form.Generators</Super>
+<TimeChanged>64415,70229.977141</TimeChanged>
 <TimeCreated>64090,75147.034342</TimeCreated>
 <DependsOn>Form.Info</DependsOn>
 
@@ -109,7 +110,7 @@ Get basic information about one object</Description>
 <Abstract>1</Abstract>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>id:%Integer</FormalSpec>
-<ReturnType>%Object</ReturnType>
+<ReturnType>%DynamicObject</ReturnType>
 <Implementation><![CDATA[
 	set item = {}
 	set item."_id" = id
@@ -124,13 +125,13 @@ Get basic information about several form objects.<br>
 <var>list</var> - contains objects ids (not oids)]]></Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>list:%ListOfDataTypes</FormalSpec>
-<ReturnType>%Array</ReturnType>
+<ReturnType>%DynamicArray</ReturnType>
 <Implementation><![CDATA[
 	set objectsList = []
 	for i=1:1:list.Count() {
 		set id = list.GetAt(i)
 		set item = ..getObjectInfo(id)
-		do objectsList.$push(item)
+		do objectsList.%Push(item)
 	}
 	return objectsList
 ]]></Implementation>
diff --git a/Form/Field.cls.xml b/Form/Field.cls.xml
index c79348c..89ba189 100644
--- a/Form/Field.cls.xml
+++ b/Form/Field.cls.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:47:13">
 <Class name="Form.Field">
 <Description>
 Form field properties</Description>
 <Abstract>1</Abstract>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64090,75443.892382</TimeCreated>
 
 <Parameter name="DISPLAYNAME">
diff --git a/Form/File.cls.xml b/Form/File.cls.xml
index 63278d2..f678506 100644
--- a/Form/File.cls.xml
+++ b/Form/File.cls.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:47:29">
 <Class name="Form.File">
 <Super>%Persistent</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64090,76829.939948</TimeCreated>
 
 <Property name="name">
diff --git a/Form/Generators.cls.xml b/Form/Generators.cls.xml
index d13da45..54efb9b 100644
--- a/Form/Generators.cls.xml
+++ b/Form/Generators.cls.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:47:44">
 <Class name="Form.Generators">
 <Description>
 Various generators called on form compilation which does not actually generate any code 
 Generators that actually generate the code should be placed into Form.Adaptor class</Description>
 <Abstract>1</Abstract>
+<TimeChanged>64415,70021.635618</TimeChanged>
 <TimeCreated>64110,50058.313465</TimeCreated>
 
 <Method name="onGenerateMetadata">
 <Description>
 End form callback method</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[&metadata:%Object]]></FormalSpec>
+<FormalSpec><![CDATA[&metadata:%DynamicObject]]></FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[	Return $$$OK
 ]]></Implementation>
diff --git a/Form/Info.cls.xml b/Form/Info.cls.xml
index 119a2d6..788ef72 100644
--- a/Form/Info.cls.xml
+++ b/Form/Info.cls.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:47:54">
 <Class name="Form.Info">
 <Abstract>1</Abstract>
 <IncludeCode>Form</IncludeCode>
+<TimeChanged>64415,70317.777266</TimeChanged>
 <TimeCreated>64090,75344.051371</TimeCreated>
 
 <Method name="getFormsList">
@@ -10,7 +11,7 @@
 Get all forms list
 w ##class(Form.Info).getFormsList().$toJSONFormat()</Description>
 <ClassMethod>1</ClassMethod>
-<ReturnType>%Array</ReturnType>
+<ReturnType>%DynamicArray</ReturnType>
 <Implementation><![CDATA[
 	#dim sc As %Status = $$$OK
 	set forms = []
@@ -25,7 +26,7 @@ w ##class(Form.Info).getFormsList().$toJSONFormat()</Description>
 		CONTINUE:'..formExists(className)
 		set formName = $parameter(className, $$$formNameParam)
 		set formObj = {"name": (formName), "class": (className)}
-		do forms.$push(formObj)
+		do forms.%Push(formObj)
 	}
 	
 	quit forms
@@ -37,12 +38,12 @@ w ##class(Form.Info).getFormsList().$toJSONFormat()</Description>
 Get all forms metadata
 w ##class(Form.Info).getFormsMetadata().$toJSONFormat()</Description>
 <ClassMethod>1</ClassMethod>
-<ReturnType>%Object</ReturnType>
+<ReturnType>%DynamicObject</ReturnType>
 <Implementation><![CDATA[
 	set formsList = ..getFormsList()
 	set metadata = {}
-	for i = 0:1:formsList.$size()-1 {
-		set form = formsList.$get(i)
+	for i = 0:1:formsList.%Size()-1 {
+		set form = formsList.%Get(i)
 		do metadata.%DispatchSetProperty(form.class, ..getFormMetadata(form.class))
 	}
 	quit metadata
@@ -90,7 +91,7 @@ For results see:
 <example>w ##class(Form.Info).getFormMetadata("Form.Test.Simple").$toJSONFormat()</example>]]></Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>className:%String=""</FormalSpec>
-<ReturnType>%Object</ReturnType>
+<ReturnType>%DynamicObject</ReturnType>
 <Implementation><![CDATA[
 	#dim sc As %Status = $$$OK
 	set formName = $parameter(className, $$$formNameParam)
@@ -109,7 +110,7 @@ For results see:
 		set displayName = ##class(Form.Property).getPropertyParam(className, property, $$$propDisplayNameParam)
 		if ((internal '= $$$YES) && (displayName'="")) {
 			set propertyMetaData = ##class(Form.Property).propertyToMetadata(className, property)
-			do metadata.fields.$set($$$comMemberKeyGet(className, $$$cCLASSproperty, property, $$$cPROPsequencenumber), propertyMetaData)
+			do metadata.fields.%Set($$$comMemberKeyGet(className, $$$cCLASSproperty, property, $$$cPROPsequencenumber), propertyMetaData)
 		}
 		set property=$$$comMemberNext(className, $$$cCLASSproperty, property)
 	}
@@ -117,9 +118,9 @@ For results see:
 	/// we're moving from the end of array to the beginning 
 	/// so we can delete null elements without affecting 
 	/// the position of elements we're yet to check
-	for i = metadata.fields.$size()-1:-1:0 {
-		if metadata.fields.$getTypeOf(i)="unassigned" {
-			 do metadata.fields.$remove(i)
+	for i = metadata.fields.%Size()-1:-1:0 {
+		if metadata.fields.%GetTypeOf(i)="unassigned" {
+			 do metadata.fields.%Remove(i)
 		}
 	}
 
diff --git a/Form/JSON/OBJ.cls.xml b/Form/JSON/OBJ.cls.xml
index b8d0adb..177d6d7 100644
--- a/Form/JSON/OBJ.cls.xml
+++ b/Form/JSON/OBJ.cls.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:48:39">
 <Class name="Form.JSON.OBJ">
 <Description>
 Преобразует объект класса Cache в JSON. 
 Изменения ищутся по слову FORMS</Description>
 <Super>%ZEN.Auxiliary.jsonProvider</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64099,77101.820492</TimeCreated>
 
 <Method name="%ObjectToJSON">
diff --git a/Form/JSON/SQL.cls.xml b/Form/JSON/SQL.cls.xml
index a0052e3..57d2653 100644
--- a/Form/JSON/SQL.cls.xml
+++ b/Form/JSON/SQL.cls.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:49:03">
 <Class name="Form.JSON.SQL">
 <IncludeCode>Form</IncludeCode>
 <Super>%ZEN.Auxiliary.altJSONSQLProvider</Super>
+<TimeChanged>64415,70816.9136</TimeChanged>
 <TimeCreated>64091,68899.667254</TimeCreated>
 
 <Method name="WriteJSONFromSQL">
@@ -282,13 +283,13 @@ Draw JSON output.</Description>
 		}
 		Set ..sql = tOrigSQL
 
- 		Set aet = ##class(%Object).$fromJSON("{"""_..arrayName_""":[]}")
+ 		Set aet = ##class(%Object).%FromJSON("{"""_..arrayName_""":[]}")
  		
  		// FORMS - debug
  		Set:$$$debug aet.sql = tOrigSQL
  		// END - FORMS - debug
  		
- 		Set arrayNode = aet.$get(..arrayName)
+ 		Set arrayNode = aet.%Get(..arrayName)
  	
  		// FORMS - pagination
 		Set tStartRow = ..pageSize * (..currPage - 1)
@@ -310,7 +311,7 @@ Draw JSON output.</Description>
 			For c = 1:1:tCols {
 				Set tVal = tRS.%GetData(c)
 				Set tOutVal = ##class(Form.Util.Converter).logicalToJSON($Get(tColInfo(c,"type")), tVal)
-				Do node.$set($Get(tColInfo(c,"name")), tOutVal)
+				Do node.%Set($Get(tColInfo(c,"name")), tOutVal)
 				
 				/*If ($IsValidNum(tVal)) {
 					Do node.$set($Get(tColInfo(c,"name")),$Num(tVal),"number")
@@ -319,7 +320,7 @@ Draw JSON output.</Description>
 					Do node.$set($Get(tColInfo(c,"name")),tVal)
 				}*/
 			}
-			Do arrayNode.$push(node)
+			Do arrayNode.%Push(node)
 		}
 		
 		// FORMS - results count
@@ -327,7 +328,7 @@ Draw JSON output.</Description>
 		Set aet.total=tRS.%ROWCOUNT
 		// END - FORMS - results count
 				
-		Write aet.$toJSON()
+		Write aet.%ToJSON()
 	}
 	Catch(ex) {
 		Write "null"
diff --git a/Form/Property.cls.xml b/Form/Property.cls.xml
index a8ffaf5..d124dd4 100644
--- a/Form/Property.cls.xml
+++ b/Form/Property.cls.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:48:04">
 <Class name="Form.Property">
 <Description>
 Methods for form field === class property</Description>
 <Abstract>1</Abstract>
 <IncludeCode>Form</IncludeCode>
+<TimeChanged>64415,70687.774584</TimeChanged>
 <TimeCreated>64090,75759.538379</TimeCreated>
 
 <Method name="propertyToMetadata">
@@ -13,7 +14,7 @@ Get metadata for one field of a form. Equal to propertyToMetadata method,
 but uses direct global references instead of object access</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>className:%String="",name=""</FormalSpec>
-<ReturnType>%Object</ReturnType>
+<ReturnType>%DynamicObject</ReturnType>
 <Implementation><![CDATA[
 	set metadata = {}
 	set metadata.name = name
diff --git a/Form/REST/Abstract.cls.xml b/Form/REST/Abstract.cls.xml
index 436e34f..a20116d 100644
--- a/Form/REST/Abstract.cls.xml
+++ b/Form/REST/Abstract.cls.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:49:18">
 <Class name="Form.REST.Abstract">
 <Description>
 Абстрактный класс, реализующий техническую обработку входящего запроса.</Description>
 <IncludeCode>%occErrors,%ZEN.Utils,Form</IncludeCode>
 <Super>%CSP.REST</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64090,76470.397537</TimeCreated>
 
 <Parameter name="CONTENTTYPE">
diff --git a/Form/REST/Field.cls.xml b/Form/REST/Field.cls.xml
index c917e51..5394840 100644
--- a/Form/REST/Field.cls.xml
+++ b/Form/REST/Field.cls.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:49:28">
 <Class name="Form.REST.Field">
 <Description>
 Брокер работы с полями форм</Description>
 <Super>Form.REST.Abstract</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64090,79242.449407</TimeCreated>
 
 <XData name="UrlMap">
diff --git a/Form/REST/File.cls.xml b/Form/REST/File.cls.xml
index f490f8f..d52cf96 100644
--- a/Form/REST/File.cls.xml
+++ b/Form/REST/File.cls.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:49:37">
 <Class name="Form.REST.File">
 <Description>
 This broker does file-related work.
 All file properies are assumed to be of Form.File class</Description>
 <Super>Form.REST.Abstract</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64091,74902.525566</TimeCreated>
 
 <XData name="UrlMap">
diff --git a/Form/REST/Form.cls.xml b/Form/REST/Form.cls.xml
index d8ec10c..6906de0 100644
--- a/Form/REST/Form.cls.xml
+++ b/Form/REST/Form.cls.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:49:44">
 <Class name="Form.REST.Form">
 <Description>
 Класс работы с формами и их содержимым</Description>
 <Super>Form.REST.Abstract</Super>
+<TimeChanged>64415,70738.823095</TimeChanged>
 <TimeCreated>64090,79002.958751</TimeCreated>
 
 <XData name="UrlMap">
@@ -29,7 +30,7 @@ Get available forms list as a JSON array</Description>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	set forms = ##class(Form.Info).getFormsList()
-	write forms.$toJSON()
+	write forms.%ToJSON()
 	return $$$OK
 ]]></Implementation>
 </Method>
@@ -41,7 +42,7 @@ Get available forms metadata as JSON object</Description>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	set metadata = ##class(Form.Info).getFormsMetadata()
-	write metadata.$toJSON()
+	write metadata.%ToJSON()
 	return $$$OK
 ]]></Implementation>
 </Method>
@@ -54,7 +55,7 @@ Get form metainformation by name</Description>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	set metadata = ##class(Form.Info).getFormMetadata(form)
-	write metadata.$toJSON()
+	write metadata.%ToJSON()
 	return $$$OK
 ]]></Implementation>
 </Method>
diff --git a/Form/REST/Main.cls.xml b/Form/REST/Main.cls.xml
index 0a176b8..6eaac08 100644
--- a/Form/REST/Main.cls.xml
+++ b/Form/REST/Main.cls.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:49:53">
 <Class name="Form.REST.Main">
 <Super>Form.REST.Abstract</Super>
+<TimeChanged>64415,70755.832506</TimeChanged>
 <TimeCreated>64090,76630.913942</TimeCreated>
 
 <XData name="UrlMap">
@@ -47,7 +48,7 @@
 <Implementation><![CDATA[
 	set info = {}
 	set info.languages = ##class(Form.Util.Translate).getLanguages()
-	write info.$toJSON()	
+	write info.%ToJSON()	
 	quit $$$OK
 ]]></Implementation>
 </Method>
diff --git a/Form/REST/Object.cls.xml b/Form/REST/Object.cls.xml
index eb4d31b..2c6d23e 100644
--- a/Form/REST/Object.cls.xml
+++ b/Form/REST/Object.cls.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:50:04">
 <Class name="Form.REST.Object">
 <Description>
 Брокер работы с индивидуальными объектами</Description>
 <Super>Form.REST.Abstract</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64090,79332.572705</TimeCreated>
 
 <XData name="UrlMap">
diff --git a/Form/REST/Objects.cls.xml b/Form/REST/Objects.cls.xml
index 886be8e..81d524a 100644
--- a/Form/REST/Objects.cls.xml
+++ b/Form/REST/Objects.cls.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:50:13">
 <Class name="Form.REST.Objects">
 <Description>
 Broker class to work with queries</Description>
 <Super>Form.REST.Abstract</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64090,79332.572705</TimeCreated>
 
 <Parameter name="ALL">
diff --git a/Form/Security.cls.xml b/Form/Security.cls.xml
index 56f90cd..7538b2a 100644
--- a/Form/Security.cls.xml
+++ b/Form/Security.cls.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:48:16">
 <Class name="Form.Security">
 <Abstract>1</Abstract>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64099,78607.760597</TimeCreated>
 
 <Parameter name="OBJPERMISSIONS">
diff --git a/Form/Settings.cls.xml b/Form/Settings.cls.xml
index fac283c..c7ed3d3 100644
--- a/Form/Settings.cls.xml
+++ b/Form/Settings.cls.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:48:26">
 <Class name="Form.Settings">
 <Description>
 Get and set settings</Description>
 <Abstract>1</Abstract>
 <IncludeCode>Form</IncludeCode>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64110,52980.392815</TimeCreated>
 
 <Method name="getSetting">
diff --git a/Form/Test/Address.cls.xml b/Form/Test/Address.cls.xml
index 75f5620..1bbfcc7 100644
--- a/Form/Test/Address.cls.xml
+++ b/Form/Test/Address.cls.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:50:27">
 <Class name="Form.Test.Address">
 <Super>%SerialObject,%Populate</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64101,39590.214377</TimeCreated>
 
 <Property name="House">
diff --git a/Form/Test/Company.cls.xml b/Form/Test/Company.cls.xml
index 8112fb1..352f70b 100644
--- a/Form/Test/Company.cls.xml
+++ b/Form/Test/Company.cls.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:50:36">
 <Class name="Form.Test.Company">
 <Super>%Persistent,Form.Adaptor,%Populate</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64101,39307.619051</TimeCreated>
 
 <Parameter name="FORMNAME">
diff --git a/Form/Test/Person.cls.xml b/Form/Test/Person.cls.xml
index eb9fba6..dc82e29 100644
--- a/Form/Test/Person.cls.xml
+++ b/Form/Test/Person.cls.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:50:44">
 <Class name="Form.Test.Person">
 <Description>
 Test form: Person</Description>
 <Super>%Persistent,Form.Adaptor,%Populate</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64101,38189.100761</TimeCreated>
 
 <Parameter name="FORMNAME">
diff --git a/Form/Test/Simple.cls.xml b/Form/Test/Simple.cls.xml
index a1dbf95..f065d4d 100644
--- a/Form/Test/Simple.cls.xml
+++ b/Form/Test/Simple.cls.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:50:52">
 <Class name="Form.Test.Simple">
 <Super>%Persistent,Form.Adaptor,%Populate</Super>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64090,75943.393938</TimeCreated>
 
 <Parameter name="FORMNAME">
diff --git a/Form/Util/Converter.cls.xml b/Form/Util/Converter.cls.xml
index e4cb89a..507311c 100644
--- a/Form/Util/Converter.cls.xml
+++ b/Form/Util/Converter.cls.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:51:06">
 <Class name="Form.Util.Converter">
 <Description>
 Various datatype conversion utilities</Description>
 <Abstract>1</Abstract>
+<TimeChanged>64415,70660.763024</TimeChanged>
 <TimeCreated>64100,82956.192829</TimeCreated>
 
 <Method name="stringToArray">
@@ -11,7 +12,7 @@ Various datatype conversion utilities</Description>
 Convert delimited string to dynamic array</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>string:%String,delimiter:%String=","</FormalSpec>
-<ReturnType>%Array</ReturnType>
+<ReturnType>%DynamicArray</ReturnType>
 <Implementation><![CDATA[
 	set list = $listFromString(string, delimiter)
 	return ..listToArray(list)
@@ -23,12 +24,12 @@ Convert delimited string to dynamic array</Description>
 Convert $list to dynamic array</Description>
 <ClassMethod>1</ClassMethod>
 <FormalSpec>list:%List</FormalSpec>
-<ReturnType>%Array</ReturnType>
+<ReturnType>%DynamicArray</ReturnType>
 <Implementation><![CDATA[
 	set array = []
 	set pointer = 0
 	while $listNext(list, pointer, piece) {
-		do array.$push(piece)
+		do array.%Push(piece)
 	}
 	return array
 ]]></Implementation>
diff --git a/Form/Util/Init.cls.xml b/Form/Util/Init.cls.xml
index 4d29f9e..680aa14 100644
--- a/Form/Util/Init.cls.xml
+++ b/Form/Util/Init.cls.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:51:14">
 <Class name="Form.Util.Init">
 <Abstract>1</Abstract>
 <IncludeCode>Form</IncludeCode>
+<TimeChanged>64415,69633</TimeChanged>
 <TimeCreated>64101,40238.796897</TimeCreated>
 
 <Method name="populateTestForms">
diff --git a/Form/Util/Translate.cls.xml b/Form/Util/Translate.cls.xml
index 4e56cd5..2e8f7e1 100644
--- a/Form/Util/Translate.cls.xml
+++ b/Form/Util/Translate.cls.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Export generator="Cache" version="25">
+<Export generator="Cache" version="25" zv="Cache for Windows (x86-64) 2017.2 (Build 543U)" ts="2017-05-12 19:51:23">
 <Class name="Form.Util.Translate">
 <Description>
 Support for metadata translation </Description>
 <IncludeCode>Form</IncludeCode>
+<TimeChanged>64415,70401.668478</TimeChanged>
 <TimeCreated>64386,54065.171182</TimeCreated>
 
 <Method name="get">
@@ -44,13 +45,13 @@ do ##class(Form.Util.Translate).Insert()</Description>
 
 <Method name="getLanguages">
 <ClassMethod>1</ClassMethod>
-<ReturnType>%Array</ReturnType>
+<ReturnType>%DynamicArray</ReturnType>
 <Implementation><![CDATA[
 	set languages = []
 	#dim list As %ListOfDataTypes
 	set list = ##class(%MessageDictionary).GetLanguages($$$domain)
 	for i=1:1:list.Count() {
-		do languages.$push(list.GetAt(i))
+		do languages.%Push(list.GetAt(i))
 	}
 	quit languages
 ]]></Implementation>
diff --git a/README.md b/README.md
index 6de278b..9c691aa 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Forms
-Forms adapter for InterSystems Cache.
+
+Forms adapter for InterSystems Cache. Supports Caché versions 2017+.
+For 2016.* versions, please see [this tree](https://github.com/intersystems-ru/RESTForms/tree/8e3ef48fbb4f6ce1dc3c471ec43cfc6e65bb2c40).
 
 # Installation