modernize smallintmap