Changes to allow for easier management of files