Changed the way registering items is handled