Added comment to schema about indexing
fixed conflicts and added client model