Updated mappings for item support