Updated files and added index in common
merging permissions