Framework update, code optimization