Partial migration to 0.5: code not complete