Add some improvement on EvalMap