Added better CLI interface with more options