Finished basic support for external AD and contacts