Add custom class resolver to get rid of springframework in storage layer