Added abstract entities and repositories