Replace element builder by generic angular model