Updated to include services in startup