Api changes, factory fix