API Update

Sorry for writing no description in the beginning, it's too much
happening to remember everything :/