Add rest filters, Update Error Handler, etc