Moving callback invocations in model to top level.