Fix output format + better constructors