Yeah me too. We can get all of this back using data attributes instead I believe.