Added presence and fixed hub identifier