Changed format and added additional information