Add relation between website and user & some schema changfes