Move singleton to `construct` method maintaining backwards compatibility