Added remaining data entities (first version)