This should be more generic, but it's a wig work to do it everywhere. Let's keep that in mind for V2.