Updated physics framework