Update catalog

Use plain object instead of an array for faster accessing