Updated API with simple Entity Demo