Renamed service
Improve getAllKey algorithm
Fix cs