Updated physics handling