Added relationships and  whitelisted model properties