Added the infrastructure for #138