Add proper mapping plan handling