Added new entities and updated some older ones
EOD commit