Moved to using existing block instances rather than item/block registrations.