Several additions to form functionality