Added behaviors and helpers. Change methods