Added direct resolving