Update declaration
Merged with CVS v2.1