Rearranged API to have devices instead of connections