Added two API pre conditions