Began adding support for optional parameters