Added search and static table base class