Reorganized block and item IDs