Add spaces for enumerations to work properly