Added optparser - working feature