Small improvement into classes mapping