Added functionality, general improvements

Added the functionality to set requirements