Removed the 'static' keyword from the type assistant and made depending classes reflect the changes