CON-21: Use getter in Form Builder