Only add options if they are specified