Fixed conflict in the enum, improved typesafety