Make rendering requirements more generic
Extract add-new-requirement method