Re-add part of formstack module