Framework update, performance optimization, code cleanup