For the time being, let's just keep this in like this and then followup to replace everything across the codebase separately.