Added additional items needed for DOAP