Improve command line argument parsing
Add type aliases