Added code to look up AVUs in different ways.