Moved to new ng interceptor model