Added instance creation detection to TODO