Refactored load publist
Merge branch 'refactor' into dev