CustomerService added, repository updated, vmlocator enhanced