Some updates and added angular