Better constructor until we have an API