Rework formspecs