Changes on Refas2Hlcl to use other classes