Updates for Blaze refactor