Included API improvements after initial integration with another project.