Improved color API