Adding common interceptor
Merging conflict
initial import