Update schema from submodule
Add company_fields to templates