Rigid bodies working again as components