Improved the location for content initialization