Added support for ABSources