#20313626506817 : Refactor for further library extraction