Remove EntitySelector, use PropertySelector