Baselined 0.2.0 functionality