Added command-line options for flexibility