Cosmetic
Add scanning packages support, unify the API for resources