Added basic argument handling