Changing services to static instead of objects