Support Oscar 0.6

This a WIP branch to track progress on supporting Oscar 0.6.