Added broken-out schema