Fixed so that services are only added once.