Simplified block registration and added item registration