Made some parameters optional