fwr: changed the enum to be dynamic