Changed the way attribute sets are handled by the retriaval module.