Add Accept header support
Add better link support