Loader refactor against Node instead of Partition