Updated components and angular