Added Color classes and more coordinate classes