Moving configuration into internal api