Starting shift towards middleware