Added stuff to advanced API