Added workspace search in registration