Updated file path logic + kernel flexibility