[#1513] Yekkanti - Refactor