Added first version of interceptor