Make attribute resolution more flexible