Increase API flexibility