Refactoring of ResourceFormBuilder

As in #159