[Neil/Remo] Implement the Add More button for multiple entries.