Add auto-instantiate.