Changed optional arguments to case insensitive