Added option to select entity