Improved instantiation strategy