Further API improvements and elimination of many wrapper functions