Change dynamic to build inherited class with Class.new
Rename spec file
Merge branch 'feature/proxy_refectoring' into develop