Adding api review changes