Improve performance of load logic
Update test cases according to recent code change
Rebuild packages