Polishing
Push v2 optional values onto blob property instead of AUS class