Added associations and amount of active subjects
Changed attributes name