Added controller suffix option