Added functionality for options