Remove addCallback method; Refactor isDefined method