Preparative work for v1.0