Changed some API stuff