Migrate to Simple 6.0.1