CON-21: Preparing FormBuilder