Improve package loading
Fixed brute force method
Minor updates