Work with Hosted 0.3.x