Added more middleware