Modified helper files