Added client-side relational mapper for 1:1 and 1:N