[#18] Refactor poly impl