Split apart similar and new api