Added more info and angular routing