Some extra api optimizations