Minor tweaks
Added Requirements constructors