Framework usability improvements