Improve API with links