Added more unimplemented entity cases

See title.