Added Class maps.
Removed weird Array notation.