Keeping old Data class
Implemented refresh button