-Object relations changed to more simple model.