Made more changes to fix discovery