Add rebuild method