Better local packages handling