Allure improvements, v2