Added optionality for inverse properties