#58 Updated supression to work on objects and classes