BS-7783: Change abstract class to interface