AUI-1008 Adding feature