API improvements and more extensions