Improve framework