New entity "Entity" & minor modifications.