Added option parsing and finish interface