Item requirement improvements

Closes #1242