More physics api reworking