Updated sources and apis