Add filtering and router