Added for CMS version 0.8