Maybe we should check (in a future pull request) if theses can be changed to vals