Adoptee drop down refactor