Added basic argument parsing