Updated args
Reordered and renamed some fields + added caption