Add form instead of single components