Added args handler class. Fixed options definition