Changed ODL architecture and yaon architecture