Adjusting conventions to include external contracts