Import/Export from Apache DS to cleanup formatting