Updates to allow for mutliple files