FYI: Fix for strict class method warnings and class redeclaration error