Added name to requirement beside ID, and updated the restriction evaluation