Added some more requirements