New function on some classes and adapted the models to use the new
enums.