Multiple API improvements, changes

Multiple API improvements, changes