Few changes on synonyms and SQL/Index