Further improvements, prepared interaction with upcoming adk.Builder