Added data initialization/destruction