Addressed concerns in Action API PR 140