More enhancements for imporved loading times