Integrated for yellow api