Refactored new uberfire dependencies.