Separate item/block references to their own class