FB-13897: Implementing new Ray design