Added draw and events for Entity