Interfaced entity - removed concrete class references