Replace element builder by generic angular model
Replace element builder by generic angular model