Fix attribute finding, add fallback