Implemented Data class and new contribution system