Changed classes for retrocompatibility. Fixed problems with proxies