Added base fns and search features