Updated API to use newly added fields