Use C++11 initialiser lists & enum classes