Added new Traits and improves into the existing classes