FIX #4: Updated optional dependency resolution