Migration from beta 1 changes