some changes regarding class resolving