Some method and instantiation updates to the new API