UPDATE: Loading time improvements