Better class format for index
Tried to work on StorageBroker