Big work started on Entity