Update company list
Refactoring templates