More api improvements