Modified Site class, modified Def2, added Def3, Def4, TCR