Updated requirements checking

Change-Id: I26dc35a26e6df31eb307c1c0eedb9c68f6ab1369