Added Blade support