Improved auto configuration of forms