Refactor item registration class