Introduced Resource File handling in most places