Improved cli parameters & Added options to generator