Added Option Functionalities