Simplify ownership model, API is much better this way