Updated floor solution to support segments