Api refactor & source list update