[DF-1899] Implemented required features.