Api simplify sprint13