New stuff in preparation of a unified API.