Added color/finish management