Updated to work with the latest BioC pkgs