Adding rebuild initial support