Callbacks and architecture fix