Added data fixes