Added some Parameter Validation and Aliases.