Fleshing out data entities and implementation