Removed addresses since they won't be used in this library