Added Item and User Validation
Updating for merge