Updated schema and repo pull logic