Refactor to allow both explicit position and append
2 files changed