#117 Removing dependency on data file