Added support for "separate_directory", switched to new format