Major api updates