Added pcolor and pcolormesh support