Major refactoring of Nature from enum to Type