Added some logging + fixed class method call