Updated interceptors to be soemwhat more flexible