Major updates including API