Last update before merge (added mail and calendar services)