Addressed possible provlem with using enums