Added eol; Missing format handling