Migration from 0.8