Added logic for "current" package