Add extension support