Move some stuff to before filters