Added multi-submit support