Added classes to help tracking