Added entries to format_source