Added possibility to make product name based assignments