Added more general requirements

See document for update(s)