Made the title enums more robust.