Added the Company form
Changes in the constant classes