Added domain objects, updated repositories.