Removed another concrete type in favour of an interface.