Maybe support both?