Extract thumbprefixer to utils
Use proper keys for thumbs