#27 Changing more commands to the new Interceptor/CommandInterceptor
architecture.