Add support for dynamic services and beginnings of identify support