Fix #355 - Add external adapter support

See #355 for details.