BP: removed nested array
BP: Added angular framework