Preparation for version 2.0