Fixes and es API in "Services"