Added data and other stuff changes