TASK KSP-1943: Added more stubs