Add indexes and Foreign Keys