Changed models from pointer attributes to value ones