adapted to most recent uberfire updates (performance focused)