Still working on Zanata data set