Adapted to updated watoki/factory