Modified to parse as strings rather than arrays