Plugin/Hook architecture added.