Controller cleanup
Add a item message validator
Update the lock file