Update to handle the stupid reflection interface that separates