Yeah, that sounds better. Although it would be not backwards compatible.