Some refactoring and start of item usage