API: Mostly api changes. Nothing significant