Add accountId parameter. Closes #2