Conversion to r10k format #2