Got rid of attribute stuff, went back to old-ish API; Added service discovery