Added cmd line opts