Add authors and switch and's format