Added RESOLVE-BASE helper