Added data and loader classes