Added data and refactored.