Initial changes to support UberFire 0.3.0