Change abstract classes to abstract interface classes where needed