Merge "Replace HashMap with ArrayMap for services"