updated to Mango 0.5 and Collection 2.0