INT-2980/INT-2987 - Add Documentation