Modified CSV Reader and Setup files