Added klasses and metods