Better requirements structure