Api changes & comments