Some more refactoring because of SaltSafe to be consistent accross all interfaces