Added options functionality