Changed architecture to support tabular data