Ref #41: Add old form functionality