Change tundra.service:self implementation to be more efficient