added defequ and defnamespace