Improve: handling of valid/invalid argument types
Initial commit