Added structure for different paint types