Refactored support form