Added fluent interceptor and unit tests