Changes to avoid the use of resource files