Started implementing API fields