More core improvements, and expanding the api's