Updated code based on changes in Zanata project