DEVIDM-79: Removed code duplication