Complete refactoring file related commands of base class