Adding options

This kind of stuff only matters for high end performance models.