Upgraded several framework mechanics.