Plot classes improvement