Changes on PhraseMixin