Updated entity models and removed drag'n drop example code