Added command line flags for flexibility