Changed output structure to list