TSUNE-107 Refactor requirements