Added options parser