More restructuring (constants)