Handle extension properly