Remove filename reference in interface (improve abstraction)