fixed issues with the default class resolution and everything should now be working as intended