[CT-16] Added stubs
[CT-16] Added stubs -2