Added physics handling