Framework improvements