Start work on separating out api declaration from response templates