Replaced concrete type with an interface