First Update for filter builder, service integration