Refactor of Src