Api improved. Auth changed to use new api