diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ca50b7f835..eb1645f5ae 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+                          in some optimization, f.e.: a[ <exp1> ] += <exp2>
+                          or directly by: func( @a[ <exp> ] )
+                          if we add passing array elements by reference
+     Implemented in HVM and PCODE generation, the compiler has to be
+     modified yet to use them.
+   * changed last parameter in hb_codeblockGetRef() - I'd like to have
+     all variables in hb_struRefer structure in one place: hb_itemUnRefOnce()
+     for easier modifications in the future.
+   * replaced in hb_struRefer 'itemsbase' with 'array'.
+   + added hb_arrayGetItemRef() to create references to array elements.
+     Such reference updates array reference counters.
    * changed STATICs passed by reference to use new array item references.
    ! block destructor execution after classy releasing on HVM exit
 
diff --git a/harbour/include/hbclass.ch b/harbour/include/hbclass.ch
index d6788c9fc7..87c52159d4 100644
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -459,6 +459,19 @@ DECLARE HBClass ;
    s_oClass:AddInline( <(MethodName)>, {|Self [,<params>] | <Code> }, HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ),;
                        <.persistent.> )
 
+#xcommand MESSAGE <MethodName> [ AS <type> ] INLINE <Code,...> [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] ;
+   [<persistent: PERSISTENT, PROPERTY>] => ;
+   _HB_MEMBER <MethodName>() [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
+   s_oClass:AddInline( <(MethodName)>, {|Self | <Code> }, HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ),;
+                       <.persistent.> )
+
+/* Must have secondary version with params because params are used in the block */
+#xcommand MESSAGE <MethodName>( [<params,...>] ) [ AS <type> ] INLINE <Code,...> [ <ctor: CONSTRUCTOR> ] [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] ;
+   [<persistent: PERSISTENT, PROPERTY>] => ;
+   _HB_MEMBER <MethodName>([<params>]) [<-ctor-> AS CLASS _CLASS_NAME_] [ AS <type> ];;
+   s_oClass:AddInline( <(MethodName)>, {|Self [,<params>] | <Code> }, HBCLSCHOICE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ),;
+                       <.persistent.> )
+
 #xcommand METHOD <MethodName> [ AS <type> ] INLINE [Local <v>,] <Code,...> [<other>] => ;
           METHOD <MethodName> [ AS <type> ] BLOCK {|Self [,<v>] | <Code> } [<other>]
 
diff --git a/harbour/tests/clsccast.prg b/harbour/tests/clsccast.prg
index c3210f1daf..a6779fdeaa 100644
--- a/harbour/tests/clsccast.prg
+++ b/harbour/tests/clsccast.prg
@@ -16,15 +16,7 @@
 #xtranslate QQOUT([<x,...>]) => [OUTSTD(<x>)]
 #xtranslate QOUT([<x,...>]) => OUTSTD(EOL)[;OUTSTD(<x>)]
 
-#ifdef __HARBOUR__
 #include "hbclass.ch"
-#translate	MESSAGE <message> INLINE <*expr*> ;
-				=> ;
-				METHOD <message> INLINE <expr>
-#else
-#include "class(y).ch"
-#xtranslate __SENDER( => SENDER(
-#endif
 
 proc main()
 local o:=myclass4():new(), i, cbErr
diff --git a/harbour/tests/clsicast.prg b/harbour/tests/clsicast.prg
index d6d6c6c6df..2a4178522f 100644
--- a/harbour/tests/clsicast.prg
+++ b/harbour/tests/clsicast.prg
@@ -16,15 +16,7 @@
 #xtranslate QQOUT([<x,...>]) => [OUTSTD(<x>)]
 #xtranslate QOUT([<x,...>]) => OUTSTD(EOL)[;OUTSTD(<x>)]
 
-#ifdef __HARBOUR__
 #include "hbclass.ch"
-#translate	MESSAGE <message> INLINE <*expr*> ;
-				=> ;
-				METHOD <message> INLINE <expr>
-#else
-#include "class(y).ch"
-#xtranslate __SENDER( => SENDER(
-#endif
 
 proc main()
 local o:=myclass4():new(), i, cbErr
diff --git a/harbour/tests/clsnv.prg b/harbour/tests/clsnv.prg
index 3c209ff4c2..8e84a3a4dd 100644
--- a/harbour/tests/clsnv.prg
+++ b/harbour/tests/clsnv.prg
@@ -15,15 +15,7 @@
 #xtranslate QQOUT([<x,...>]) => [OUTSTD(<x>)]
 #xtranslate QOUT([<x,...>]) => OUTSTD(EOL)[;OUTSTD(<x>)]
 
-#ifdef __HARBOUR__
 #include "hbclass.ch"
-#translate	MESSAGE <message> INLINE <*expr*> ;
-				=> ;
-				METHOD <message> INLINE <expr>
-#else
-#include "class(y).ch"
-#xtranslate __SENDER( => SENDER(
-#endif
 
 proc main()
 local o:=myclass3():new(), i, cbErr
diff --git a/harbour/tests/clsscast.prg b/harbour/tests/clsscast.prg
index e1b3c0c227..6e7982576f 100644
--- a/harbour/tests/clsscast.prg
+++ b/harbour/tests/clsscast.prg
@@ -16,15 +16,7 @@
 #xtranslate QQOUT([<x,...>]) => [OUTSTD(<x>)]
 #xtranslate QOUT([<x,...>]) => OUTSTD(EOL)[;OUTSTD(<x>)]
 
-#ifdef __HARBOUR__
 #include "hbclass.ch"
-#translate	MESSAGE <message> INLINE <*expr*> ;
-				=> ;
-				METHOD <message> INLINE <expr>
-#else
-#include "class(y).ch"
-#xtranslate __SENDER( => SENDER(
-#endif
 
 proc main()
 local o:=myclass4():new(), i, cbErr
diff --git a/harbour/tests/clsscope.prg b/harbour/tests/clsscope.prg
index 1bac58b543..1461dc3771 100644
--- a/harbour/tests/clsscope.prg
+++ b/harbour/tests/clsscope.prg
@@ -16,14 +16,7 @@
 #command  ? => OUTSTD(EOL)
 #xtranslate QOUT(<x,...>) => OUTSTD(EOL,<x>)
 
-#ifdef __HARBOUR__
 #include "hbclass.ch"
-#translate	MESSAGE <message> INLINE <*expr*> ;
-				=> ;
-				METHOD <message> INLINE <expr>
-#else
-#include "class(y).ch"
-#endif
 
 #xcommand MAKE_TEST(<obj>,<v>)                        ;
         =>  begin sequence                            ;;