Improve integration with orchestra/foundation.

Signed-off-by: crynobone <crynobone@gmail.com>