Add extend support