Started adding entitySelector