Use proper package detection