Added interceptor#
Merge
WIP