r1538 + redesign SLB relational model