Small modifications to add options