Improve cascade mapping classification