Added ability to select entity