Add index subject and little change in some models