Refactored to use link class.