This could be removed in favor of what's already included in OAE.