More data update
Centralizing entity functions
Added more attributes