Added new classes and scopes, ecc..