Add Id and IdSet