Simplify types. Better api.