Making options optional
Should not be there