added ext support