adding rebuild support