Added classes and methods + args