Shouldn't this be externalized as well?