Services improvments