adding extend support