Added Coloring and Boolean editing support