Added colour class control