Refactored to use callPackage right