Added attributes, merged helpers into actions