More APIs and some minor updates