Updated for Bioc 3.0