Make collector options flexible