Migration to 0.6

Feel free to modify this changes.