Frontend: added some performance improvements