Updated API with extra fields