Changed to enum titles and removed class methods.