Minor API updates; Won't be changed in the future except in a new version