Improving User and Organization entities. Related to #37.