WIKI-808: Refactor added code