Added dump all option
Minor change
Added flags