Added Uberfire into the mix