Made API work