More work on slot_map library