More work for v1.0rc1