Added in new files to handle resource management