cleaned framework from master. Use this only with basic classes