Upgrade to onyx 0.4.0