Change from static fields to enum