Merge pull request #545 from Dmitry-Me/fullyUseEnum

Fully use enum