Changed format significantly and parsing functions