Add more extensionless handling