Updated/Completed Entity Classes