Search Space updated for completeness