Feature/ubhavsar/BEES-98