Actually, I'll do that, that way we don't have to have the clunky mapping :)