Description

Use abstract interface to simplify the code in few places.

News snippet

Code refactoring.

Checklist

I have checked that my code follows the Octopus coding standards
I have added tests for all the new features added in this request.