Adding a $options parameter to most defines