Added simple local type resolution