Added options for using taxonomy/calculation and property prefix