Implemented handling enum settings fields in more generic way and moved settings enums to separate class