Add oo refactoring for Color