Improve links module