Added __filename handling