FIX: Updated adapter handling to always resort to symbol