Added support for ubiquity
1.2.2