Added full dynamic form creation