Improve resolve class name model
Merge branch '1.1'