Simplify the Data class to be lighter and improve file parsing. Fixed #4