Catchup implementation of api