Support blaze (need to test backwards compatibility)