Added a few more missing requirements

Main code rev. 1913