Fixed the bad mappings in the DAO (needed to reference the Impls, not the interfaces)