Added add OOB functionalities