Improved method usage
Extracted vfs