More class maps implemented