Edinburgh forwards Luke Crosbie and Viliame "Bill" Mata have extended their respective stays with the Pro14 club.
Back-row Crosbie, 20, has signed his first professional deal after making eight appearances this season.
Fijian lock/back-row Mata, 26, joined Edinburgh in September 2016, and has penned an extension to 2020.
"Both players have bought into what we're building here and it's a huge boost they have chosen to stay," said Edinburgh head coach Richard Cockerill.
"Luke has progressed really well since making his debut earlier in the season, whilst Bill has been world-class since his return to first XV action."
Academy graduate and Scotland Under-20 cap Crosbie, whose contract also runs to May 2020, broke into Edinburgh's first team in October, making his senior debut against Zebre.
"I have always wanted to play for Edinburgh as a kid and I am proud and delighted to sign my first professional contract with them," Crosbie said.
"I'm looking forward to working hard for the team and [to] play my part in building Edinburgh's already strong culture."
Mata helped Ben Ryan's swashbuckling Fiji Sevens clinch Olympic gold at the 2016 Rio Games, and has also played rugby league.
He has scored seven tries in 23 appearances for the club.
"I'm really pleased to re-sign with Edinburgh," Mata said. "My family and I have settled in the city and I'm really enjoying my rugby.
"Richard Cockerill has developed a great environment, both on and off the field, and it's an exciting time to be part of the club."