Make some args optional