Added data and file parser