Hahaha, I thought you wanted to think about these fields... You can do it in a separated PR, so I can merge this one and get it running in staging.