replacing hash map by less expensive vector (also as preparation for incremental model update)