Further api improvements