Store requirements as list rather than weird map