Don't use own API anymore