Added service, database and website types