Added new data. Refactored script