Changed the construction of struct contains data