Added action specific callback. Seems to work for #7