SN-118 Implement task and fix bugs