I agree, probably we need a better mapping