Made some optional paramaters mandatory