Made data format more explicit