Add services support