Added initial file parsing