Continue work on profile/service discovery