Generalized method provider
Updated file handling