Added traits and improves into existing classes