Update for processing after 2.0b6