Editing DAO to support Annex and AnnexManager (not finished yet)