API change + more options