Added variable-size to map