SANTA ANA (AP) — Immigration authorities may start housing transgender detainees based on the gender they identify with following criticism about detention conditions for the population.

U.S. Immigration and Customs Enforcement released proposed guidelines Monday that say staff should consider a transgender detainee’s preferences when making decisions about housing and clothing and what pronouns to use.

Andrew Lorenzen-Strait, ICE’s deputy assistant director of custody programs, says the agency will track data about transgender detainees and could house transgender women in female detention facilities.

ICE says it has about 60 transgender detainees.

Advocates say they doubt the guidelines will improve conditions and want transgender detainees released.

Last week, a heckler interrupted President Barack Obama’s remarks at a gay pride event in Washington, D.C., to protest the detention and deportation of gay, lesbian and transgender immigrants.