Add some more middleware