Remove SCHEMA as it's always unique
Swap range_key implementation for something more efficient and rename identifiers accordingly