introduction of the enum types instead of the String names