Added links & type props