fixup! split etl buildapi adapter into mixin classes