add some improvements
add some improvements in relationship