Fix selector and add new properties