Updates for better ashes integration